bugfix(aigroup): Prevent game crash when a player is selected in Replay playback (2)#2711
Open
Caball009 wants to merge 4 commits into
Open
bugfix(aigroup): Prevent game crash when a player is selected in Replay playback (2)#2711Caball009 wants to merge 4 commits into
Caball009 wants to merge 4 commits into
Conversation
Caball009
force-pushed
the
fix_object_selection_replay_crash
branch
from
29b2761 to
2909a9e
Compare
|
| Filename | Overview |
|---|---|
| Core/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp | Replaces the use-after-free getCount() == 0 heuristic with a safe doesGroupExist pointer-liveness check; updates the comment attribution and date |
| Generals/Code/GameEngine/Include/GameLogic/AI.h | Adds doesGroupExist(AIGroup* group) const declaration to the Generals AI class, resolving the missing-declaration issue from PR #1212's follow-up |
| Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp | Implements doesGroupExist using std::find over m_groupList; consistent with the existing destroyGroup pattern that already uses std::find on the same list |
| GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h | Mirrors the Generals header change, adding doesGroupExist declaration to the Zero Hour AI class |
| GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp | Mirrors the Generals implementation; identical doesGroupExist body using std::find over m_groupList |
Sequence Diagram
sequenceDiagram
participant GLD as GameLogicDispatch
participant AI as TheAI (AI singleton)
participant GL as m_groupList
GLD->>GLD: "currentlySelectedGroup != nullptr?"
alt pointer non-null
GLD->>AI: doesGroupExist(currentlySelectedGroup)
AI->>GL: std::find(begin, end, group)
GL-->>AI: iterator (found / end)
AI-->>GLD: true (exists) / false (destroyed)
alt group not in list (destroyed)
GLD->>GLD: return early — avoid use-after-free
else group still alive
GLD->>GLD: proceed to process selection
end
end
Reviews (3): Last reviewed commit: "Made 'AI::doesGroupExist' member functio..." | Re-trigger Greptile
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
Caball009
commented
May 15, 2026
xezon
approved these changes
May 15, 2026
xezon
left a comment
xezon
left a comment
There was a problem hiding this comment.
Makes sense. I have not thought of that.
xezon
added
Major
Author
|
Replicated in Generals. |
xezon
reviewed
May 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
With the fix from #1212
AIGroupPtr currentlySelectedGroupwould be accessed even if it had been destroyed and its memory deallocated. This is a use-after-free bug. It relies on the memory not being overwritten on deallocation.If macro
MEMORYPOOL_DEBUG(enabled byRTS_DEBUG) is enabled, freed memory is overwritten with a garbage value, so the game crashes whencurrentlySelectedGroupis dereferenced (at line 2132).TODO: